Auto merge of #4062 - huntiep:master, r=alexcrichton

author bors <bors@rust-lang.org>

Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)

committer bors <bors@rust-lang.org>

Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
author bors <bors@rust-lang.org>
Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
committer bors <bors@rust-lang.org>
Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
diff --cc src/cargo/ops/cargo_new.rs
Simple merge
diff --cc tests/new.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 7 Jun 2017 16:37:40 +0000 (16:37 +0000)
		1	2
src/cargo/ops/cargo_new.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/new.rs	patch \|	diff1 \|	diff2 \|	blob \| history